Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 16:33:27 +0000 (09:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 16:33:27 +0000 (09:33 -0700)

Trivial merge